Added better support for development envs.