Commit - Bug resolution - Refactoring
Resolved stats updates
Refactored Repo -> Dao