Added more support for playing files