Cs 4863

Extra repositories and methods for core entities.