Refactor HaveRecord