Completing multi-interfaces support