Improve index create and query support