Revise interaction API