Added annotations for validation and added migration