Updated to be compliant with SQuIDS v1