Readd missing files

This reverts commit a0df164483d43f98db2ec331bb074e1fc46b289a.