Updated constants for convention