Moved default values to properties