Adding plugins support