Reverted the entity encoder.
Reverted the entity encoder.
Cleaned up the method used to determine extra associations
For many-to-many association, the normal array/list is replaced with ProxyCollection.