Helper Class Changes

Helper Class Changes