Added support for 3-digit and 4-digit notation