modified schema to include support tables