Added support for 2.5.1