Refactor model and profile store