Add Yield support