Add 3.x Series Support