-Moved Class constants to definitions
-Updated Documentation