Rework commands utility