Added more plugins & mappings