Add synchronization to registerBundle
XML Cleanup