Added check for parent child relationship for data-points and streams