Added category id and validations