Modify for production environment