Add implementations for other versions