Refactor crumb support