Introduce play with target and rework target handling