Put asset tag support back