Moved some Object functionality into the base class