Change tag so that it returns better object