Added a few more util classes