Moved constants into a drop-down as well.