Major changes to selection mechanism for building plugins