Add basic command awareness