Added Helper classes, to clean code and make it OO