Added back some Map builders as extn methods