Added some defaults to set functions