Moving towards more generic platform handlers