Added better support for the extension XML