Could we maybe move this to the base class? What do you think?