Improve interactions