Topics/refactor plugin