Some modifications, add dump file