Added custom unlock digit support