Clean-up dependencies and add support for DriverOpts in EndpointConfig