Refactored magic strings for commands and integer keys