Migrated to static class