added data types and state variable links