Move annotation mapping to class a property to make it easier to add new custom annotations