Added defaults and new drivers