Updates to xsp config flattener