Updated common data model namespace with traps, query for spark graphs