Added the default values in a better place