Added Utilities + Bug fixes