Support digits
Under the hood improvements
