Refactor record model on UI