Changed all objects to inherit from PsApiResource