Add type field, order client/server/site