Added many plugins, fixed mapping issue