More work on drive plugin