Add and refactor