Updated model, Added data annotations