Added initial generator functionality