Plugin Overrides - Close #193