Adds validation (2nd commit)