Moved all Generator objects into the Generator's if-statements