Working on adding return type for query