adds missing files and fixes serializer