Make Loader::wait a hash so we can do non-integer based ids