Schema corrected