Added new constants. Should be tested.