Merged multiple annotations into one @Resource annotation
Eliminated converters (too cumbersome)