Adding ability to set metadata