Add meaningful IDs, and use them.