Updated constants for cleaner handling.