Add image tagging support