Is there plans to replace this with a non-blocking alternative in the future?