Added validation
Changed data type
Changed comment method