Refractoring for next release
ref