add yaml & fix validation