Add ability to set command target per window