Updates for Static Server 2