Removing direct Game and Payment dependency
Updating public