coding plugins and refactoring of some features.