Better command linking