Updated to use strilutil library