Removed class hierarchy for the Generator class since it was causing
issues with the incorrect class being called due to ambiguity in the
applicable class caused by generics.