Much better handling of the skip-lists