Added classes for price calculation