add metadata (should be better)