Added interface handling