Issue #11: Column Family support: address review feedback