Added validation and new terms: