Refactoring, add constants