optimize decorator structure to Annotation