Add support for solarsystemwrapper and rowdict