Add optional support for image tagging