Added a plugin version of the framework classes