Adding map expression factory method
Corrected import