Use a more native approach for inline commands