Improved Cassandra auto-detection