Added support for many2one and one2many relations