Refactor: move entity annotations to fields instead of methods (fixes #37)