Use new constants everywhere