Minor refactoring - removed un-needed annotations. Tweaked resource mapping