Added plugins support