Added data annotations to models