Adding map support