Can now handle shapes for more than 6 models.