#3 - Implementing target and taskContainer support