Added database support for maps