Make sure we include root type in JSON