Add Intersection type
Add simple map support