Yes, the time limit is within two years from the date on which the cause of action arises. This would mean two years from the day the deficiency in service or defect in goods has arisen/detected.