fixed bugs and remove List serializer