Add more data access methods and unit test cases