Added X/Y support