Added a utils class and move some methods to it
Changes to util class
Merge