Refactored repository
Integrated latest changes