Player wrapper created + some refactoring.