Added stuff to Analysis and Constants.