Removing default() calls and supplying all values in the defaults/main