Rewrite platform code to be smarter