Added custom game support