Added selector dao and test cases