Compatibility with Sandcat 5.0b1