Added some new classes and constants.