Added better support for SM Platform