Change to new const syntax