Make thing simpler, make sure we can run it in production with production settings