Changing entity model to better fit the application needs.