Add support for static methods
Optimize StaticNotifier