Add a hidden field
Refactor and add model methods