Improved the cassandra type