Added production breakpoints