Breadcrumb refactoring.