Refactored handling of multiple interfaces