Add missing files and more