Now uses more compact representation of data