Dump, redesign to static class