Implement Cassandra models
Minor bug fixes