Minor refactoring for micro generators