Added support for v5.5.1