Refactored Annotation controller to prepare dual text/image support