Added production code tasks