Add support for xpress