#19, #20 added DbSystem parameter to schema mapping