Refactor add more constants