Add service tag and some update