Core.class refactor