Update for new static serving situation