-- Added Helper class