Nearly complete implementation of plug-in feature