Remove static methods
Add support for Argument, Method and CTOR annotations