Some changes to repository module