Added some functionality needed for the REST service