Changed model reference scheme to try and better handle MysteryShopper namespace