Add context to commands