Added a bunch of consts