Added digit support