[Major] rewrite is working with ObjectDao with including operations