Rebuild with Context patch