Added Helper class back
Fixed namespace