Small changes to repositories and entities