Removed Location dependency from IPlayer