Cleaned up createScvizModel