Decoupled plugin classes from the core classes.