Updated server features (again)