Add basic v2 compatibility