added not that Index & Query API is not yet implemented.