Moved annotations in Unit model Object to public getters instead of
fields.