Platform refactor