Add more utitlity classes