Add optinal image tagging support