Structural changes and grunt workflow mods