pojo+ service

Changed XML configuration based pojo to annotation based