Added a couple of utility classes