Cleaning
Adds more missing instances