- Code refactoring
- Add abstraction for DAO, Parsers