Added some utitlity classes and minor updates to current ones