Added: model wrapper