Change from annotation based config to xml based