cfk-141 changed some wrappers and validate function for writing custom location to XML