Added 2.6 build support