Add support for file and image attributes