change dump data, re factor some classes