Upgrade to generator 0.11