Refactor backbone