Fixed issue related to refactoring of Cassandra specific classes