Moving all the static data to a private struct