Deprecate tap. Add tap_mark as replacement