Cleanup
Better auth class support
Merge branch 'fix_better_plugin_support'