The mapping and distance calculation methods need to be revised so that further methods can be added easily.