Refactor/data config