Improved support for metadata.[Metadata now updates on file upload also]