More updates to the Schemas so that it can properly delete the images