Added some utility classes