Rename for testing
Make addon base class not abstract