Interactions improvements