fixed map + added support
added vendor prefixes