Added smart player functionality