Improve serialisation of kits