Better support of 64 bits ids