Adjusting to include commands, properties