Completed adding @driver annotations