Added in some helper classes to make life simpler