Add wrapMap to prevent fromMap users from breaking.