Add "all" and "now" support.  Add macro for modification operation.