moving index completely out of DAO layer