Readded generic types for Addons classes