Add AOP acronym
Add support for @Metered annotation