Domain and repository changes