Added some forgotten files from previous commits