Start to use Oobjects where necessary.
…more dObject work.