Adding support to the v4,6.27