Changed structure for repo struct