Readded some files that got accidentally removed