Refactor add backend