[DEV] Improve serializer