Refactor on Record Types