PlayerEditState enhancement