Updated to work with NGA West-2 database