Move Map and Point constructors out