Add no-arg contructor and entity annotations