Upgrade to mmps-db-2.1 and adjust database configure