started moving values out of xml for pure annotation config