Annotations re-factory