Add serializer and handshake