Switched out References with Entity Reference, with some accessory modules