Further refactoring of blocking commands