added toMap