I would leave this as is, or move it to the adapter if it is useful for other commands.