Updated to match constants.js