add more missing instances, start to organize the instances