Adding in server features with checks