changed Map to Dict to allow for a non-constructor Map function