Move override methods to separate module