Primarily updates to discovery functions