Converted to plugin infrastructure with extra view support.