Updated config to not use XML