Class based overrides should probably move to data attributes