Merge class add-on implementation
Split class addon implementation