A piece of refactoring and development. Mostly on plugins concept.