Players new features, some refactoring