Further mods towards integration