XMLMap refactored
CamelCase refactored