Improvements in WindowCommandHelper