Issue #9: Dynamic build and refactoring playOff