Re-implement annotations to use the approved classes. Allows migration to Java 8