Improved support for interaction.