Simplify the structure of the add command as much as possible as a template for the other commands.