Change to use dynamic commands