Switched from guice-no_aop to full guice