Refactor model
Add fragments