Added number, and data-key support