ORM changes for cassandra