Add supoort of version 2.0.7