PlayGraph refactoring