Changes due to Dysco class refactoring