Refactored interface - plugins should be updated