better context for commands