Issue59 : Refactor usage/storage of Model