Add improved plugin infrastructure.
provide helper classes.
make use of new and easier helper classes.