Update to Generator system ~0.14