Tag: improve flexibility