Fixed XML repository support