Changes to make the backend more production ready