Added the handling of platforms