Refactor of ObjectSerializer
Add missing reference