Adds more constants to improve code readability