Refactored all models to differentiate between edit mode and reading mode