Maybe move this to builder function as it's not doing anything more.