Windows-Element Controllers enhancements