Add support for running in non-dev mode