[misc] Improve cordove usecase