Extended Generator properly.