Feature/data refactor