Type updates, removed VariableSymbol