Update to use Maven Annotations