Add data + refactoring