Updated scheme for production