Added some modifications for production