#137: Enhance game addons