Improved cassandra detection