class utils readded to repo