Changed shortmap to use fromList instead of insert