Will this need doing for the other entities too?