Some changes for http