In progress: Validation functionality