Added new Repository Classes and some changes.