use better metadata