Added column family generation for tokens