added adapter and serializer