Make it work on v2 with cleardb