Adds 2.6 support