No longer requiring overrides manually