Added Utilities class and some fixes