rework for cassandra
repo refactoring