Added util classes to repo