Update after refactor rampage