Made types model based, added four new dances