I would move this to the mixin