update to types and interrelationships