Make it prod-ready