Refactor custom directory label handling