Support for -X option