docopy/dodump abstraction changes