Added more utilities