Added defaults and project configuration defaults