Feature/dump support