Added support for targeted commands back.