Added better default values