Improvements for production mode