Little refactor
Better record hierarchy, hierarchy only for collection foreign