Better arguments passing
Better platform detection