Added missing files and changes