Refactor + persistance + service