Add GenericObject class