Add overload for mapping scalars