Added annotations to domain classes
Revert "Added annotations to domain classes"

This reverts commit 3b15aab72e118dfc592b1d98072004596adf8f36.