Blobs updated to new inheritance pattern without 'that'