More updates to DSGA class