Improved CassandraSource