Changed a few things in abstract base class for rest