Added DBRef support