Extracted similar Get/Make functions from GenHelper to separate class and simplified the invocation.