Simplify code with new Map features