Drop static and create dedicated core class