Missing interfaces were added back.