Upgrade to multi-compilation