Added support for Entity Reference