Hi, Currently Moose-Query works with Traits. There is : - TDependencyQueries containing all the query system and the common queries such as #queryIncomingAccesses - TOODependencyQueries using TDependencyQueries and adding the method specific to OO entities (mostly inheritance queries) The users of TDependencyQueries are: - TOODependencyQueries - FAMIXAnnotationInstance - FAMIXAnnotationInstanceAttribute - FAMIXSourceAnchor The users of TOODependencyQueries are: - FAMIXNamedEntity I think it would make sense to move TDependencyQueries to FAMIXEntity. FAMIXEntity has all the API needed to the queries and it would help with the consistancy. For example I think that all famix entities should be able to answer to "queryAllIncomingAssociations". It would felp making more generic tools. What do you think? Does that bother someone? -- Cyril Ferlicot https://ferlicot.fr http://www.synectique.eu 2 rue Jacques Prévert 01, 59650 Villeneuve d'ascq France