Add upgrade query support