Plugin 'architecture' in place