Add more utilities