Build XML improvement