Removed an unused method
Refactoring update

Extract some data access methods