Added additional constants to simplify configuration