Add backward compatibilty for 2.0 and 1.0 clients