Added 2 way id hashes to schema