Updated constants to reflect changes