Issue #59 - Refactor usage/storage of model