Provide a class that works with v31.0 and earlier