Modified util classess