Added dependent relationship support