Refactor global players