Update for new commands and primitives.