Adding xml config and cdi support