added partial subgenerator but there's an issue regarding mocking