Adding support for clusting columns - still can't obfiscate them or partition keys