Small refactor, support player files