Added mappings for repositories + code cleanup