Added semantic maps stuff again, for tests.