Add improved relations and driver interface.