Better multi-plateform support