Add support for XhYmZs