DBMaker: improve extendability