Adding order querying and location.