Change BasicUtils to Calculator and add interest utils