Updated Helper class