Better handling of GLV dependency