Add validation and metadata highlighting