+ Migrated some of the code to use AndroidAnnotations