Refactor to dashboard model