Code changes to fix cassandra issue