Added basic context table structure