DBMaker: remove circular reference in generics