Improve Player class