Some changes for server