Refactor Model
Merge pull request #2 from andyhq04/feature/offline

Refactor Model