[READY] Validation improvements