DP-3181 : Moved new function to other file