Changes for skip-level feature