Added defaults and set types