improved implementation of Dish model. Not all validations are in place