Updates to run in production mode