Added context table (unfinished)