Add basic query and route / leg classes