Some changes for hosting