Made changes to models to support return of volume in liters etc.
Plus made design changes