Add mapping mechanism so that we can use the same env everywhere