Added ability to handle specific target via cmd line