Updated files and scripts