Added support for --wrapper