Implement usage of new entityrepository everywhere