Updated constants and paths