Implemented review comments in plugin manager. #989 (Implement review comments in plugin infrastructure)