Added Sonora support