Refactor thumb retriver.