Helper Class Updated