Changed to XML context config.