Make kit implementation serialise correctly