Back to static for the singleton