Add support for 'x' and 'data' prefix