Added support for more games