Added methods to classes in preperation for the API