added ObjectID support
partial old IR support