Final mapserv-only version for now