@prabinb mind removing the generator functions? We ended up removing this from Spark...