Refactored Generator & Added GetterTrait