Add more default values

Change-Id: I5ae925fbb48b2b4b54deeee93ebe31a521f2532a