Added data annotations to classes