added plugins support