Fixed class reference
Refactored repository