Added some util classes