Changes due to refactoring of dysco class