Add custom metadata support
Add custom metadata write support