Helper class updated