Issue 7337: Use in Command Line targets internal data structure