Added ability to force a wrapped model