added basic map support