Dysco class refactoring