Removed flags from the system
Made the Generator a static instance