THis should also be under cms/envs/common.py as well