Updated files with server counterpart