Changed structure of the Repository