Refactored calls to cover all generator requirements.