Fix json serialization for more complex objects -- still looking for better / simple approach