Refactoring around plugin list builder