@amitaibu What is the status here? Should we wait on the key by entity type?