Refactor CRFModel