Deployment

This PR introduces improvements which are required to run on the production server.