added plugin support - 1st step :)