Added stuff for default values