Particulary refactored model wrappers
Particulary refactored model wrappers