Better support for different players