Updated db, location class and location yype