Move override up to parent class