Added X management