Now using java configuration