DBMaker: revert circular reference in generics