Updated Repository interfaces and classes