Implemented xml where missing in main scaffolds