[AD-7] - Fix mandatory and default values information