Additional changes for the skip-level feature