enabled more classes
fixed to work with Cassandra
changed to make work with Cassandra