Add missing files
Updates from review