Adding some missing files from last commit