Removed flattening of results