Refactor and restore some model methods