Add context sensitivity to commands