Moved Constants to own Class