Added the ability to use @Subscribe annotation

 - This allows for cleaner code and more flexibility
 - with method naming