Add native map support