Added serializer optimization components (need unit tests)