Added missing files from previous commits