Improvements to support several types of games