Change 1.7 to 1.8
Organise imports
Deprecate player handle