Local and global run support also remove generator as required dep, it will remain optional for tests only