Hotfix for Container imports