Changed to id system for hashing