Added basic plugin support