added ooo and stripped down schema