Update target creation; regroup targets