Rework default.xml