Add count support to the remaining commands where it makes sense