Updated to support Generator v2