*8521* Moved method to library