Better spell integration