Added Freeze for production