Sub generators are now more flexible