Update for refactor