chore(CR Feedback): Updating docs and adding validation