Major Framework change to handle one2many scenario