Add support for skipping generator