Updated files to match server version