Add optional image tagging support