Refactor old user defined tag to new style