Added basic support to disabling for different plugin types