Add support for multi-targets selection.
Clean up for v1.5 launch