Refactor proposal's model. Closes #123