Added yaml, fix schema