Updated spring @Context configuration