Added canton mapping