Improve constants
Use new constants