Added extra utilities