Added initial plugins support