Renamed classes
Adding missing overrides