Added missing files from merge