More wrapper & model refactoring