Ok, latest push addresses both of these issues. I agree the virtual base class approach to hooks is much cleaner. Thanks for the suggestion.