Update to models and data annotations