Interactor enhancements