added changes to models for UI ease in coding