Refactorings and added references to plugin dependencies