Made some changes on user files and permission