Update Serializer and Loader for new KMF