add support for +v and +m