Use internal IDs instead