Support for Klepto, some simplification of data.