more progress on schema