More BUILD updates
Handle offer URI in Service