Finished the platform refactoring