add 2.5 support