Add support for badges to the map.  Add support for a port on the database connection.