Now supports metadata