Fixed [Issue#15] by changing the way collection/map serializers are modified to handle lazy loading