Added interaction support