Added variable and table functionality