Removed dependence upon Player API