Updated utility classes to not be instantiable