Add XML driven design