modifications to use local xmls