Removed 'Base' exclusion