Resolve name space issue in serializer