Added an option to specify the target