Added missing files from commit